Shrink cid

Change-Id: I00556341b746f186f424ebe46c94fd02f10e6536
v6036

Change-Id: I7e70d0e2e367f703fe420d4300eb5fecdc247099
Merge branch 'cm-10.2' into martincz