am 224ec55f: am 664251a2: Merge "Fix build" into mnc-dev

* commit '224ec55f98afdf571334723285f9d51682b7f82b':
  Fix build