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

Change-Id: Ib1e02fdc5c0a4f0b2a70e77b3d9207bafb310931