am 22571e18: Merge "Fix and cleanup." into mnc-dev

* commit '22571e18570c01310372261ce5f3dbc7bd3f5616':
  Fix and cleanup.