am 9bc4b2d7: am 03b39148: Merge "Make SubscriptionController thread safe and...
am 9bc4b2d7: am 03b39148: Merge "Make SubscriptionController thread safe and some cleanup." into lmp-mr1-dev
* commit '9bc4b2d7':
Make SubscriptionController thread safe and some cleanup.