Merge "Fix VerificationActivity Intent" am: b2d41e93f8

Change-Id: Ie9e153c83afae642e7322c27a1f7e179ab1575e6