am 36671b92: am 825e0da2: Merge "Fix race when cleaning up receivers/services...
am 36671b92: am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev automerge: b7ce6d6d
* commit '36671b92':
Fix race when cleaning up receivers/services in Context