am ef4ec260: am 15dcebe1: Help fallbacks and intent work

* commit 'ef4ec2603270dac4b7a001220b023721ce3aab54':
  Help fallbacks and intent work