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

Change-Id: Iaf51459df0643e82503b862ff1216fe413af91c0