Bug: 13751317 (cherry picked from commit e386ad34) Change-Id: Ie3f812610abb508c9baa6220802d8fd6a73f78b8