Merge "Added @UsedForTesting to 'missing' methods to avoid ProGuard removing them"