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

Change-Id: I39b95a6b609fd61be4391fde742b526c7eabe032