Merge commit 'c9c190c2' into mit

* commit 'c9c190c2':
  Use TelephonyIntents