[automerger skipped] Merge "overrideConfig should use existing notification flow for CCC" into qt-dev
am: acb94cf7b7 -s ours
am skip reason: change_id Ie2cccbab3e186091515bcdaf683d6925d2cbae37 with SHA1 97ce72822a is in history

Change-Id: I10fa7c11f8881f75db5d4caf19b2c09d765ee9a6