[automerger skipped] Fix scoring test for unsupported models and models without evaluators. am: 226e8f13b7
am: ea38d07523 -s ours
am skip reason: change_id I1c5a481a35072b7c8b72711dfb011744a389c886 with SHA1 c8361d8b48 is in history

Change-Id: I9eb1a10a5bc28bc4f54dd118a8021bb3f7c6dce0