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

Change-Id: I4c38324d3923cf62856b801c811217eb5fa3d6e4