merge from open-source master

Change-Id: I686f28fcfcff1cca7cf254de9e4334cc4ea2fef7