merge from open-source master

Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c