Address some PHP CodeSniffer errors and warnings

Change-Id: I495481e3532834f1f8a45cda9402d609de7e2bd7