[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: 4dec7281 -s ours am: 386daba1 -s ours am: 2b78e1fa -s ours

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

Change-Id: I479668c64edb7473165b7f5c599508488f023788