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

# Via Android Git Automerger (1) and others
* commit 'ac20bf1fcda9210640fd8e4d71b0644a2b012658':
  Change default intent