Add a size when checking local reads/writes. am: 18cf8168ef
am: ac3f8501e9

* commit 'ac3f8501e951c721f62e1e98bd7793fab01aecd9':
  Add a size when checking local reads/writes.