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