merge from open-source master

Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956