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

This reverts commit 9700e1c90bc808b98e5e5d824ea7c57cdab4b874.