Merge "Stop Prompting user to add account when no account available Bug:25161189"