Merge "metricsd: Fix the update channel parsing logic." am: 87d2486777
am: 2a95850444

* commit '2a95850444d04c5225c15fda1350cf7130fa8c49':
  metricsd: Fix the update channel parsing logic.