Merge "Remove non-updatable-* prefix from .txt files"