merge from open-source master

Change-Id: I5f7a14b12ccff63b9e1813bb4a93c44654a92e4a