Merge "Add app_compat namespace"