am 6edde7bc: Merge "Fix for blue screen of death" into lmp-dev

* commit '6edde7bc64b805d2d1d3a23e135d32c99e0aec4d':
  Fix for blue screen of death
tree: 17f9ca97a64cc358b217da258bee47f88cc18dd0
  1. InCallUI/