[automerger skipped] Ensure non-standard returns release monitors
am: bbb1adb9e4 -s ours
am skip reason: change_id I2efbb8854dd5530c66d780f6853ec6e05a69c83b with SHA1 49af704f0f is in history

Change-Id: I11eb20635300326a2ac5a4e70c0648eb346d3120