am 43a601e7: Merge "Change default intent"

# Via Gerrit Code Review (1) and Irfan Sheriff (1)
* commit '43a601e76966ae1d4af5b1117c10f0479a5f97cd':
  Change default intent