merge from open-source master

Change-Id: I72922bd787ea0fbc199d9362e1cd1d2ed8283b57