Bug: 29067535 Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c (cherry picked from commit fdbf3312)