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