Bug: 30963384 (cherry picked from commit df7a4c6bae) Change-Id: I2255486e84dd55af0f4e7fbbfb616c2deb1765d0
df7a4c6bae