merge from open-source master

Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d