Merge \"Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\"...
Merge \"Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa\" into nyc-mr1-dev
am: 22eaf715
Change-Id: I657487ecab8b23a002e32072bca17d21e627a804