Merge "Frameworks/base: Fix precedence bug"