merge from open-source master

Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca