Merge "ipq6018: Support for new smem version"