Merge "Fix Calling Accounts UI regression" am: 550aa93e61 am: a092176385
am: ccc89e2bbe

Change-Id: I9db2285d6f063d4602328b987364f890d8e3f5a7