(cherry-pick of commiteab17da588) (cherry-pick of commit4171cdf303) Bug: 23113288 Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
(cherry-pick of commiteab17da588) (cherry-pick of commit4171cdf303) Bug: 23113288 Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3