[automerger skipped] Merge "Use locale to decide out-of-service message" into...
[automerger skipped] Merge "Use locale to decide out-of-service message" into qt-r1-dev am: f7a27e50
am: d9fff50c -s ours
am skip reason: change_id I1887f3c72a594b61f45867332e1c4bce62b41612 with SHA1 e8aab0f2 is in history
Change-Id: I5fbe50a11f5bb9607a3ca4fe4797a165aee456b6