am 2a3fd9ef: am 05eb62a0: Revert "Make SubscriptionController thread safe and...
am 2a3fd9ef: am 05eb62a0: Revert "Make SubscriptionController thread safe and some cleanup." automerge: 3373d226
* commit '2a3fd9ef':
Revert "Make SubscriptionController thread safe and some cleanup."