Also remove redundant ok/cancel strings b/13512724 Change-Id: Idfc7745fbf6a08f09051eb4a6154fc446b43eb67