Merge "Frameworks/base: Fix missing cast"