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

Change-Id: I25aa7cf91e8f515be7a3124f238781d57b5ee23d