Merge "Add validation type definition to support multiple probe result" am: 3bdd969ff7
am: 4547d8f2db

Change-Id: I743028abffb4fb62fb7c4bfaf74ef864a052fdd7