merge from open-source master

Change-Id: I412376856ebbcec786181c7a9d3b4af4ef52c7a6