Pass phpcs-strict on maintenance/oracle/

Change-Id: I27b4de208d8d22f7f52817497e32ef9f008598e0
Pass phpcs-strict on maintenance/storage/

Change-Id: Ia39b316e01797ddedd71885c2f05fe57ba4b89e9
Merge "Pass phpcs-strict on maintenance/oracle/"
Merge "Pass phpcs-strict on maintenance/storage/"