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

Change-Id: I41350b9fa79b6ef2df701344459133adf1507059