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

Change-Id: Ie157c95b9ceb70ee45b9c8033fcb0a7357fb3354