[automerger skipped] Merge "Fix Sms7BitEncodingTranslatorTest to build" into...
[automerger skipped] Merge "Fix Sms7BitEncodingTranslatorTest to build" into qt-dev am: 4e451042 -s ours
am: 84b84eec -s ours
am skip reason: change_id Idaa0ef12da7c07dbd2808a914d714f96a89b2319 with SHA1 46131ee6 is in history
Change-Id: I9c017bb5fe7757f3aab1fe3af6356d825eff1ac3