Merge "Use platform-compat-fw to separate enforce location change"