Bug: 11411129 Change-Id: Ib93d2f75024b3def54eadc11547990150deccf4d (cherry picked from commit a5245445)