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

* commit '61dea6728f564467c186a4c1e2bd53d7ef7bc00d':
  Stop Prompting user to add account when no account available Bug:25161189