merge from open-source master

Change-Id: Ic07f9774ce9cd04437d5e5096f32ce3d46d7116a