Ensure non-standard returns release monitors
am: bbb1adb9e4

Change-Id: Ie144ea6414de9728748f08623606405132eaf895