finishing cherry-pick

idea is taken here -
https://github.com/zarboz/M7wlv_KK_kernel/commit/5d3e4d8fd65ebb2f6da5ab511ad69963632455d1