Merge "Remove MASTER_MONO from replaced settings" into rvc-dev am: 951d75d4f8

Change-Id: Ifa768d32a9bb2be6bd768743d6f91a7d9cd5443b