merge from open-source master

Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9