Patch7: Modified code to meet coding conventions

Change-Id: I94f93b5bb76c28b8781ed46ac2e5815e7158f1ec
Merge "Patch7: Modified code to meet coding conventions"