Merge "cleanup of obsolete non-CI arm PODs"