Sync commits submited by @mkaluza from Samsung_STE_kernel repo