merge from open-source master

Change-Id: I6d111015c27324b9ae94ac4701ba1a7187f97ee8