am 15062160: am 1e6efea1: Merge "Remove AllContactsActivity"

* commit '150621605d4d9993e6a9ffae34af171ec4ee06ba':