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

Change-Id: I092becd4abeb08e2297995e4d12cf02ad2f6ca8e