Bug: 130741987 Test: Tested on device Change-Id: Id6dd485c73f9453970b8d79929ffc04acb2c76c8 (cherry picked from commit 494071463b)
494071463b