Signed-off-by: Sagar Bijwe <sagar@espressif.com> Merges https://github.com/espressif/esp-idf/pull/3627