merge from open-source master

Change-Id: Ia99df155e4abf0585ed46943b75a2a1569d0534f