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

Change-Id: If371525951302629018504590bbb168f10d89107