am 6f68b90e: am 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev

* commit '6f68b90ebf7714a628b110a2c4c534c17d7e20d2':
  Revert "Revert "Fix build.""