Merge "[automerger skipped] Merge "Support RCS master switch" am: 6de3c4c12e am: fea850f7d3 am: 0eccfd882e am: 3995a671d1 -s ours"