Merge "Disable 160-read-barrier-stress temporarily" am: c569d4a083 am: ea3e8cf854
am: ba2a2495ca

Change-Id: I2d412a19f8839ca5570b16ea83d98bf603b768d2