Automated sync from github.com/tensorflow/tensorflow#3111

mergify[bot] merged 2 commits intomaintensorflow/tflite-micro:mainfrom

sync-from-upstream-tftensorflow/tflite-micro:sync-from-upstream-tfCopy head branch name to clipboard