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

Change-Id: I9da903b8611fba5be0b0255870fb845bb19c55eb