merge from open-source master

Change-Id: I183a933e96222f8c01516210cfa4be5f18e35b70