merge from open-source master

Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac