Revert^2 "Handling intent whose nested intent keys not collected case"

This reverts commit 7369d99861defc270f9fc227ab40ea88f6310b8a.

Reason for revert: Fixed the bug

Change-Id: Ic51e5fff6fefc8fb4e485c1065f4007ed8ca09cd
4 files changed