am cadf090d: Merge "Inline long shift code"

* commit 'cadf090da2dc91a3d6b842324e85f12ea6fef2ef':
  Inline long shift code