Merge remote-tracking branch 'upstream-public/pr/2786' into mbedtls-2.16