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

Change-Id: Iecdfc67a966f832caf7c90d615dce6657e12069c