Bug: 13186058 (cherry picked from commit 14ae4a87) Change-Id: Ib529cc10abc2d413e9da65c043dbc2638b734acd