Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running."