Merge "More robust @RequiresPermission handling."