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

Change-Id: I1b755de6009bfb55163bd8c13c65b17541198f33