[automerger skipped] Merge "Require a more specific intent" into qt-dev am: 4305c5fbf8 am: 663079facf -s ours

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

Change-Id: I4cd0b1798a1420f598c121cc9d8217b0d785a6c4