Merge "Clean up for multiple validation result update" into qt-dev
am: d2307eb494

Change-Id: I7c757df0a76b45c798cbd7ce7d97810cdbdf4325