synchronized access to the mSubscriptions map
Merge branch 'master_up'