bug: 12175514 Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa (cherry picked from commit b4aeac7305)
b4aeac7305