Misc fixes for cm-10.2

Change-Id: Iaabc0b2f910936d081faa8666e8e383edc0e9421