merge from open-source master

Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4