otter-common: Update resources

Change-Id: I5802b718308f8288cef4173cdfeb7f2faccef6ff
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1