Merge "confirmationui: Add portability test" am: 7e6517f8e9 am: f04431c792 am: 7ff76b4eb4

Change-Id: I9ddba56dcca9a0325fc09e5b38215a4e73875bdf