Backport defaults structure

Change-Id: Ie3722b411e4c03a26589ef0505fee70d43d9cf78
Prod-related: PROD-28395 (PROD:28395)
2 files changed