Merge "Changes to adapt confirmationui AIDL spec."