Merge "Revert "Disable 160-read-barrier-stress temporarily"" am: e58b971b57 am: 03c1a76d68 am: 46f60b06c5
am: 5088cbb1ce

Change-Id: Ib7062164df7c7bf533617ff2733e20d3776fad09