Merge "Add a fix for old, broken devices."
am: 957b431d22

* commit '957b431d22ff432e8d00c0da181c682f1f8e7daa':
  Add a fix for old, broken devices.