Merge "Align account icon size of ChooseAccountTypeActivity" into pi-dev am: 8aeb74ace1
am: dcff236ef4

Change-Id: I25f8a2e59a1a5d015718695af6fbee6ea31e6192