bug:22031382 (cherry picked from commit 1f82ecc6) Change-Id: I9a74edb185cb806045903dfe9695d9cc1a02e86b