Merge "Remove MASTER_MONO from replaced settings" into rvc-dev am: 951d75d4 am: 0234447c am: a08b5b47 Change-Id: I53783e71d08cb4e6f34c15af3dd89d46a00c5082