Further style tweaks.

From Vibha.

Change-Id: I29d572d3d8335368bc1cd9e70b2ae53b4236014a