Merge "Revert "Protect INTENT_BUGREPORT_REQUESTED""