merge from open-source master

Change-Id: Ie72de601744653bcd7e9fa3debe71d3c8f2fe591