Remove removed message keys from maintenance files

Follow-up to change-Id Ia6d73c2deb9428d214b7d69b29235094de75c52e

Change-Id: I17a9960265fa44c45468ec5cdc5b5839dce475cc
Merge "Remove removed message keys from maintenance files"