Merge "Necessary fix in drivers to upgrade to mbedtls-2.18.0" into integration