Cleanup intent handling.

Change-Id: Ife3a6296ee25766bc6f8d87d0786d47ce3f536d1
1 file changed