am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
  Fix occasional phone app crash