merge from open-source master

Change-Id: I4489db828e47c7c1987cd5cb768009eeb0a124b7