Merge "Fix incorrect calculation of sizeof package structure" am: 757e286cc8 am: 530fdccbe4
am: 2f176bb2cd

Change-Id: I4dd8f888102fadb1d636256e742742ad2388af2b