merge from open-source master

Change-Id: I9365615f5f94484fb5ab28bb076b25fb4721e2bc