Merge "Fix incorrect left shifts."
am: d2b5a53ef8

Change-Id: Ica7dcb8d4606aeeeae71667400ddb833a03cd808