merge from open-source master

Change-Id: I7d0f3b08f6e632b689c870017374741a544bc7e8