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

* commit '0d1d5ffb15bec02ebd1354c8f563deecba389811':
  Consider channel index masks when calculating channel counts.