Merge commit 'bd75da5da4a2dea7cb57a157f63c76bfb0c4d081' * commit 'bd75da5da4a2dea7cb57a157f63c76bfb0c4d081': Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
Merge commit 'bd75da5da4a2dea7cb57a157f63c76bfb0c4d081' * commit 'bd75da5da4a2dea7cb57a157f63c76bfb0c4d081': Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.