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

Change-Id: I900f2fd97f03f384f47ccff44adc3f06fc41f113