a16ecc04a5
This PS just includes minor changes for consistency and readability. For consistency, patchesJSON6902 are always specified in kustomization.yaml as patchesJSON6902 even if they could be specified as patches. patchesStrategicMerge are always specified as patches. Change-Id: I96b07838730207984be815e5f8fa8f79f59cebe1