merge from open-source master

Change-Id: Ia22080192681c2ac596582d6cfdac732b1ff4c9f