Merge "APM: invert priority of sonification and enforced routing strategies" into oc-mr1-dev
am: 12907260c6

Change-Id: I1b3a841ef1bf861ad37735eb2621d731c3e2cedb