Merge "Fix missing offset for apk." am: 9a00f596d3 am: fb3535ea56
am: 7255c42dda

Change-Id: I1f0f423f12df722f8cb0f059437e95953e4a1518