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

Change-Id: I518d0ef1d2953d63ec510440516bf10d305a9afa