Changes for Slim
Merge branch 'slim' of https://github.com/sileshn/android_device_samsung_melius3gxx into slim