merge from open-source master

Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661