Merge remote-tracking branch 'lg-devs/cm-12.0' into ls