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

Change-Id: Ied4ce9aa42db44818623274dfad1f66a3e72c026