Merge "Clean up dead code in NetInitiatedActivity"