merge from open-source master

Change-Id: I5f552b45caae639170674213c23f154437b58afd