bd0955dfd7
Bug: 151598694
Change-Id: I7df6b7538f7233163868065b866b610c45dc7b46
(cherry picked from commit ccf083dc7d)