Bug: 8605629 (cherry picked from commit 94ad78c3) Change-Id: Ib83d2ca3e1fe2c716f31f6919632bfd6d2cdf278