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

Change-Id: I93c2fa1384255cbb311f0c246d37cd16cae84d7a