Merge "Fix VerificationActivity Intent" am: b2d41e93f8 am: 4579ab30c3

Change-Id: I52ae362254044c43ab3262ebd511d646da4861b5