Merge "ipq5018: Enable Env overwrite support"