Minor code cleanups

Change-Id: I338656e8f131b36aae342af94f1c2cedad14ae2b
Merge "Minor code cleanups"