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

* commit '5ccd64b46e548dd7bc4d5252f640c0406e955e5c':
  Consider channel index masks when calculating channel counts.