merge from open-source master

Change-Id: I950e9aca87cbb0c35099b1d53cff6378bd0f26f4