Update edison to cm-10.2

Change-Id: I012a9f570dcd2674d591dfd012177e7d97a6c2cc