[automerger skipped] Merge "Clean up for multiple validation result update" into qt-dev am: d2307eb494 -s ours
am: 9662d52ea4 -s ours
am skip reason: change_id I4424663292c5ad29eb7a888fa6975835721a5d2e with SHA1 ec20a373d1 is in history

Change-Id: Ie90e2d13b68fe37fb608685b82c184b283304715