[automerger skipped] Merge "Modify docs to reflect operational changes in...
[automerger skipped] Merge "Modify docs to reflect operational changes in overrideConfig" into qt-dev
am: ed12eb24 -s ours
am skip reason: change_id Iff2a6e2cf867ab2e8677ac67f31d87e0365ec9fa with SHA1 ddad44d4 is in history
Change-Id: I21403f8d5e89e68a68383bcc6bcb3f2ac1a9c2b8