am 78760b4a: Merge "A bunch more cleanups" into mnc-dev

* commit '78760b4ae47f5d59a541cbcbf1fca623bae4508a':
  A bunch more cleanups