Merge "[automerger skipped] Merge "DO NOT MERGE: delete configs that reference internal objects" into pie-cts-dev am: 6f6c30378d -s ours am skip reason: subject contains skip directive"