[automerger skipped] Merge "Require a more specific intent" into qt-dev am:...

[automerger skipped] Merge "Require a more specific intent" into qt-dev am: 4305c5fb am: 663079fa -s ours am: 07fb4f88 -s ours am: a15824b2 -s ours am: f395b23f -s ours

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

Change-Id: I96693dcd43c3ec580237a9a14cfd44e46f2dc5b3