Merge \\"Added multi sim support back for brazil channel 50 messages.\\" into nyc-mr1-dev am: f0c929017f
am: c65ba9b08c

Change-Id: Id08987b8fee1f5ff8fb125520d97e4ffda7d4df2