Merge changes I4fba1982,Ia0812a11

* changes:
  snapuserd: Fix PrepareReadAhead
  Fix a typo