merge from open-source master

Change-Id: Ie7b46de270df88e7dbf9eb92a45e1ff7a315b1d0