Merge "Fix integer overflows while intializing reference lists" am: 47d5e6bb93
am: f374a3c5d1

Change-Id: Icd9865f27e7e0816acb4de9ec8caa71a59d17795