merge from open-source master

Change-Id: I5d1276f8343d9f590616dc2ab91e0164b2d31426