Merge "[automerger skipped] Merge "Support RCS master switch" am: 6de3c4c1 am: fea850f7 am: 0eccfd88 am: 3995a671 -s ours"