Merge "Fix setting of map_offset in frame data."
am: 8158d708c3

Change-Id: I14c4f2cd4273c5434226ea9765ca74a30bf69630