merge from open-source master

Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777