merge from open-source master

Change-Id: I9e7ebc99f0de12ed3ae38a3882481485a96f9680