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

Change-Id: I6034bd3ba8b492bde1fcbb72ad5c153b8c06d635