Merge changes from topic "ti-stress slicer"
am: ec99514299

Change-Id: I950827ee39adae1856ba0090194e3d48893f36b5