Merge "Make auth fill UI size sane size" into oc-dev am: c0851e72a5
am: f9ec22d29a

Change-Id: Ic093d7cc4d38b22064e6c0e39d71e90e0dd9344e