merge from open-source master

Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0