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

Change-Id: I4424663292c5ad29eb7a888fa6975835721a5d2e
tree: 342e2115218e2589768ae644aa0fedd6eb41e787
  1. core/
  2. services/
  3. tests/