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