Code clean up.

Change-Id: I8814d8482df5709b03ef105f547f4981db34919a
13 files changed