am f58a9091: Merge "Make setting the session token in MediaBrowserService...
am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev
* commit 'f58a9091':
Make setting the session token in MediaBrowserService synchronous