bug:27865109 (cherry picked from commit 5a62dd96) Change-Id: I667e514b76510107f6affd9963e4ec83ee629866