Import from commit Ia8b2150cd328a546e3ccb663d5b48a245dafe132

Change-Id: Idd7d6f719bfaef6389b4579871565fa9835231c7