merge from open-source master

Change-Id: Ib65087940790a8d3b72d8d345a11e7c9c53896cd