Merge "Allow locally disabling R8"