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

Change-Id: Ia38cdbda17b786960107829aa8559fa90dfe784b