Merge "Make ti-stress work on RI"
am: 9f13307f8f

Change-Id: I0f4a763f7d54bbb44dcc303a763ee2df6919a358