merge from open-source master

Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597