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

Change-Id: I6e6c1ae6696dc051a7be9a1640723a0d910f5abe