Merge "Clean up for multiple validation result update"
am: 7a5b9c2d0a

Change-Id: Ia9986a70d01a4aae0fef647fe2e210f55f38b8dc