merge from open-source master

Change-Id: Ibfb8fa35451409348864854ed28bb2c5cd12e6b3