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

Change-Id: I0bf97227dc97827d2134d0590e002b5c4b15dc21