Bug: NA Test: build Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872 Merged-In: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872 (cherry picked from commit bffef1f0)