Merge \\\"MediaRouter: Select/unselect route controllers for the updated route group\\\" into nyc-dev am: f6a4ad301b am: 6857cf9830
am: fdb4c3f447

Change-Id: Ib54012a70f23425837a4aad020673062b22d9aa3