Merge commit 'e0df2c4f' into fix-merge-conflict

* commit 'e0df2c4f':
  Telephony: Signal Strength cleanup & LTE support

Change-Id: I655fcc0cf430820a50a8751ac132c73f7d8e0c6f