am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev

* commit 'd5f387bc5f41dce790076ab5f6a242ec4f6cc792':
  Looks like MNC is gonna be API 23.