Merge change 4254

* changes:
  Treat some right shifts as narrowing conversions.