DO NOT MERGE Prevent crash with bad Intent

Bug: 8421255
Change-Id: I1b099901243dfd87390a9d70bc0779c3fc33e777
1 file changed