Merge "Remove prefix property from platform_compat_config module" am: cc55cca985 am: eb6576d67d am: 68c7df5124
am: d8327e2b74

Change-Id: I7bf8dd4b65d170a100a7e90ef0ac7ee5a84e8f5f