Merge "Fix shift that is out of range."
am: fe83837

* commit 'fe838373ad058c38627961773b84fa1a06e13175':
  Fix shift that is out of range.