Test: build
Bug: 115843312
Merged-in: Ibcc9ce533fbc6980a371eb6239a53dc9cdebb22a
Change-Id: Ibcc9ce533fbc6980a371eb6239a53dc9cdebb22a
(cherry picked from commit 1bf4e92c50)
Test: build
Bug: 115843312
Merged-in: Ibcc9ce533fbc6980a371eb6239a53dc9cdebb22a
Change-Id: Ibcc9ce533fbc6980a371eb6239a53dc9cdebb22a
(cherry picked from commit 1bf4e92c50)