Merge "Only verify output of models a vendor nn service fully supports" into oc-mr1-dev
am: e51f34781a

Change-Id: Icc0c10174317bb677c72c2109ef53486abcc234e