Bug: 15927194 (cherry picked from commit 0378aaf2) Change-Id: I462b5ac256c4d091ed4023cf4b97dd6a4abcaa5f