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

Change-Id: I0a0cefef7df2cebfc9687f17abc9797f7cd61ca7