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

Change-Id: Ie7ce1a2a92e2fa3e653df3f95be8ff6a8f4d2a47