[automerger skipped] Merge "String change for ConnectionFailureNotifier" into...
[automerger skipped] Merge "String change for ConnectionFailureNotifier" into qt-qpr1-dev am: 5e52236b -s ours
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 c630fbbb is in history
Change-Id: Ibc28e5de4b961e8f709bdc05923136769d6021be