Initial commit for cm-10.2

Change-Id: I683485afc70bf4fe1cf8a109d7179867b758b2e2