overlay cleanup

Change-Id: I771d027391dbbf922b50c9da154fca34b0fd9b1a
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2