Code conventions

Change-Id: I0f58d4675cf26050ea1e2f58fb748e0aed74b54d
Merge "Code conventions"