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

Change-Id: I8628079e7bc75b2918dcb7305222f1be988198ba