Merge "VerificationActivity clones calling Intent" am: ff266fb064 am: 3244294cad

Change-Id: Ib96899dffff1b07d260ccb68bdc4209d56ab2902