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