Initial commit for cm-10.2

Change-Id: Iaf13c97369505d72f4e3cf3004dc3b746accf422