Ensure non-standard returns release monitors
am: 49af704f0f

Change-Id: I84ae5af429d188e188b42db2bcd7382b31d6c3e8