merge from open-source master

Change-Id: I160f8677dc9fb144b3a3190ee4ea500cad71af2b