Bug: 15141726 (cherry picked from commit f2f9daf9) Change-Id: I28ce8aae1713a9826a3373e1eb60e0edf267f64c