am 36ea805f: am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev

* commit '36ea805f1e55fcf96e341668a200668939b03976':
  Fix tuner for secondary users