Bug: 17431155 (cherry picked from commit 08ff81f8) Change-Id: Ia76f78ededb1ba6554c95257cf8cff18bd12d1f3