merge from open-source master

Change-Id: Ie1dc11ee5c184b8f355ca8e2c1a74f86aea4c299