merge from open-source master

Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e