Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread