Formatting minor-fixes

Change-Id: Ia3b91eb2675d8c709f6b93b8c88e90e193501687