[automerger skipped] Merge mpr-2021-09-05 skipped: 012cd5840b

Change-Id: Ieedaa18766268518b0f1ffc09b847f90df5dbf6a