Merge "Add validation type definition to support multiple probe result" am: 3bdd969f am: 4547d8f2 am: 4932896e Change-Id: I546b36cdbc1c805a6ea4b7d1d909daa865472cae