Fixed some contact editor compiler warnings

Change-Id: I31deaeeedc4ae49da6b0326b128767785cd01852
8 files changed