(cherry-pick of commit eab17da588) Bug: 23113288 Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
eab17da588