am 3274e60a: am ac20bf1f: am 43a601e7: Merge "Change default intent"

# Via Android Git Automerger (2) and others
* commit '3274e60a47c9333080fb094e4c91094e3f3cd10c':
  Change default intent