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

* commit '6c7eb9059ef4ab78f772bb5899d1ff0c21d4a888':