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

Change-Id: I7f4eda96cba30740edf82505e0dc9b94d9e4bd51