Bug: http://b/27837319 (cherry picked from commit 3d0153a807) Change-Id: Iec2cd10fa77ed1881d55ac4e0ab48e45172f0cf7
3d0153a807