[automerger skipped] Merge mpr-2021-09-05 skipped: 696b770300

Change-Id: Ic4db0e5833929934b218a9e565a155d09000d54a