merge from open-source master

Change-Id: I9294848f414638851784d060f38be28810e76941