Merge "Add non-logging method to PlatformCompat"