Bug: 8291716 (cherry picked from commit 153d9276) Change-Id: Ia53b85b95621b7000034e4c6259d6586d0987dee