Ensure non-standard returns release monitors am: 49af704f0f
am: b067732b8b

Change-Id: I9ad04923ca9cfb8f87df0af74750d5a6a1b7cb91