Merge "Confirmation code second try." am: df0f5e9791
am: cdc3c3ec77

Change-Id: I4c0de71e0c488551f6d0fa5e1f73ca2971e4a5f6