Merge change 24514 into eclair

* changes:
  Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.