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

Change-Id: If40e32e06c36a5d9836370aef88de5e13f3044b9