[automerger skipped] Merge mpr-2021-09-05 skipped: 376525f24a

Change-Id: Ie87e751e9b6ad2e83ac58030115895cfc4101824