merge from open-source master

Change-Id: I5b1a7e1448dc3bfeb499201e0332de550da1380a