merge from open-source master

Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078