Merge "Require a more specific intent" into qt-dev am: 4305c5fbf8

Change-Id: I768140bf923b20d721ad9afc66983437597277f2