merge from open-source master

Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c