Merge "Frameworks/base: Fix trivial equals implementation"