Bug: 30947921 Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9 (cherry picked from commit 4436d6fe16)
4436d6fe16