baselines: Sync with the data repository

Change-Id: I107588637d0f0b3a652706632c69f3c855678277
Merge topic 'use-external-data' into next

e187aac2 baselines: Sync with the data repository