Merge "Fix incorrect left shifts." am: d2b5a53ef8
am: 497d0dd5e5

Change-Id: I2094a36ded898248d8bd8604bc77700915dbf9bf