Merge "Clean up ti-stress" am: 61944b0c75
am: fa7c8ecbb1

Change-Id: Ideaa429960da917d6c8b730e6f12038654cb4a84