Bug: 12077052 Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab (cherry picked from commit 89b366fa95)
89b366fa95