am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev

* commit '80688be665c7cff4b53217422a0ec13b0c0272da':
  Consider channel index masks when calculating channel counts.