leo: bring up for 4.3 and cm
leo: finish updates for cm