Merge "Confirmationui Rate Limiting App Abort Bug Fix" am: 2d5b18b9b7

Change-Id: I1095ce1686fd8a85c195b387406d965aa743c8cb