Merge "Use truth from tradefed directly" am: 3b2e537c46 am: 333861fd3e
am: 4ed4e4f43e

Change-Id: Ia21c0da8b46c088413c6575f0c61a8926eed9bac