Merge "Deactivate bundled opportunistic subscription."
am: 69a618fb5b

Change-Id: I11b1b85f8b241ec4e990dd946a4f32dd0b803ee2