Merge "Fix issue with ti-stress not requesting correct capabilities"
am: 8b8dc29f33

Change-Id: I3d2d5c552e6be0fa5567628e7c71dc02489622fd