Merge "Fix ActivityNotFoundException" am: 6f7241a5c0 am: b450825b37

Change-Id: I900f0531b83156f0fe355d046d357a7cdb24c054