merge from open-source master

Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03