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