am d5087784: Merge "Revert "Fix and cleanup."" into mnc-dev

* commit 'd508778493323e5a992110e6990ad120cb9a65c0':
  Revert "Fix and cleanup."