eb66898be0
Bug: 136293958
Change-Id: Iac169d91a784b5f2d05410a06cd358f85b533562
(cherry picked from commit 4bfcf04ae9)