Merge "Pass phpcs-strict on maintenance/storage/"