merge from open-source master

Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471