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

Change-Id: Ibe62eee6f9e205cf323b78eea83752b9bde12999