Coding conventions - whitespace, ===

Change-Id: I56d876529993970b42cf33dc1badb1429b1eda12
Merge "Coding conventions - whitespace, ==="