Merge "Use truth from tradefed directly"
am: 3b2e537c46

Change-Id: I6243435d5c4b4dc5b100dc7f84b9cfe38877436e