Merge "Confirmation code second try." am: df0f5e9791 am: cdc3c3ec77
am: 5ad2fbabf8  -s ours

Change-Id: I806e1dc1a2fa399db4578f6b5919dec70a313f7d