Merge change 9265 into donut

* changes:
  Highlight IMEI-reading as part of READ_PHONE_STATE description