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

* commit '10743961204a10b7c320e53f6ec937b3113769d8':
  Revert "Fix and cleanup."