am 7f8e55ec: am c6c17b93: am 962c9f05: Merge "Small cleanup"

* commit '7f8e55ec809f32a2b560cba2888dfce1cd49123c':