Merge "Remove prefix property from platform_compat_config module" am: cc55cca9 am: eb6576d6 am: 68c7df51 am: d8327e2b Change-Id: I7bf8dd4b65d170a100a7e90ef0ac7ee5a84e8f5f