[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: 2686110f -s ours am: 0825d014 -s ours

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

Change-Id: I252700164578e16d45a34eb1e42f3410558e35dc