m2v2: fix TO-HONEYCOMB-762 (assert during content copy)

Change-Id: I11b346b79dc0e1a37b9b8d03a281c44a0945f92e