Merge "Update preloaded-classes-blacklist"