bug:23128949 (cherry picked from commit b0d22083) Change-Id: Iea81925ebd0fd60fe58a972269313a98f93fdac5