Merge "Update m7vzw contributors" into cm-10.2