Merge "Fix ActivityNotFoundException" am: 6f7241a5c0

Change-Id: I5aab02df44d371733b2414f0280f45d3a322cf68