Bug: 15014252 (cherry picked from commit ec80e7e1) Change-Id: I159d66764749e41d2a97e0912f796085b4fdb6e1