Merge "Modify docs to reflect operational changes in overrideConfig" am: 2d5af940ae
am: 032fb54fae

Change-Id: Iff2a6e2cf867ab2e8677ac67f31d87e0365ec9fa