Merge "Fixes to get cros_mark_as_stable to work with Gerrit changes." into 0.13.434.B