merge from open-source master

Change-Id: I4bbf0fccef174a7f0eb8241b422f846ea21c3349