Merge "Use noteOpNoThrow instead in AMS" into oc-mr1-dev am: d3293ab4c5
am: 8bc2569538

Change-Id: I23fff8cb959ad183c0b15654c7c7f3f3dc2764ed