Revert "Revert "Merge remote-tracking branch 'ls/kitkat' into ose""

This reverts commit c07665d606433eacc997f0b2cdb07abc70419a27.