Bug: 195028385 Test: can build now. Change-Id: Ie14285b614318a99098f4457d7564a25724cde6b Merged-In: Ie14285b614318a99098f4457d7564a25724cde6b (cherry picked from commit fff8e219)