am b6a10ce2: am 85c114df: Merge "Various changes." into lmp-dev

* commit 'b6a10ce2e9e8d27d079eb18055f9527f2a9c5cbc':
  Various changes.
tree: a3237e41802436f35cc37987a364f17c4fa485d7
  1. InCallUI/