am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev

* commit 'c3809332fca20139543710abc78b185fb1abc9f2':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes