hide these as they're not in aospa configs
fix merge errors