automerge: 5a51050 * commit '5a51050519a3738488a4f7186e9822c448362a37': More AudioPolicy registration