Merge "Corrected alert window text based on UX feedback." into oc-dev
am: 2075b09c62

Change-Id: I4cf2e5d489cb35c16f87b4dc68665c7a73c10ddf