am 7e22cc99: am 78760b4a: Merge "A bunch more cleanups" into mnc-dev
am: 1ad0936c77

* commit '1ad0936c77d3c742970e7051c62c715a00c082ca':