Maintainership updates

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