Merge "ConfirmationPrompt: Update for API review." into pi-dev am: ae938f5437
am: fd25bbeb02

Change-Id: If95b232037febb1a615a8b49e9e6d4ba6938d756