merge from open-source master

Change-Id: Id5e821e29b8d7ad1c1e103c8f219934bb0214eb8