[automerger skipped] Merge "Require a more specific intent" into qt-dev am: 4305c5fbf8 am: 663079facf -s ours am: 07fb4f8818 -s ours am: 4dec728186 -s ours am: 386daba160 -s ours

am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 d16e86f466 is in history

Change-Id: I2c18c24f8c11a67eb106e88eb0fdd84cfc9b7b65