Merge "Remove HUN when user launches intent from its guts" into rvc-dev am:...
Merge "Remove HUN when user launches intent from its guts" into rvc-dev am: 89e616fa am: 2c82f6bf am: 6d31a1ca am: 4f2a5672
Change-Id: I9fbce7ce51cfc9be15b4a46b4be49fd546db10d2