6d473eed7d
With the update of some linting packages, several style fixes were needed to conform with the updated style guidelines. Change-Id: If73036a6d4a3a2f6e93b15d1fa6ed3d253fdc7b1