Merge "Remove jdemeulenaere from frameworks/base owners"