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

Change-Id: Ief3ecfb71899ff5995435b8435556fe7858d5abc