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

Change-Id: I41880353a27a378bbd675b79fac5431b308394db