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

Change-Id: Iff3b6d5c25b391d9104e0fe22348cfdd95275164