Merge "Fix to add existing connection for emergency only account." am: 30cecdb810 am: 6f36c7fda1 am: ec849a6158

Change-Id: I60191fe4a5902c2e4d73a4731f6ba582aea4dbcc