Merge \"Update the deletion helper intent string.\" into nyc-mr1-dev
am: 148a56f156

Change-Id: I796da8879deede67d28321680b96ff890699c718