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

Change-Id: I85bf0ab467906445e886171f822c8a40185edea5