Bug: 17006816 (cherry picked from commit 5a18dde0) Change-Id: Ia538e30012fed46cefba33092395c5361c571062