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

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