Merge "Temporarily disable CorePlatformApi logging"