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

Change-Id: Iad2cbeeccbebb2f212bbf259dc5f6cfccd9901e8