otter-common: Cleanup

Change-Id: I052df462df9f37de97bf220a803bff0d9fbf4a8b
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0