Merge "Modified text to cancel enrollment" into qt-r1-dev
am: fde49ec3ad

Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678