am ed6193a7: Merge "Revert "Revert "Do not update the type of something we already know.""" into mnc-dev

* commit 'ed6193a75b90ec3026622b2cbc146452a85b8d47':
  Revert "Revert "Do not update the type of something we already know.""