[automerger skipped] Merge mpr-2021-06-05 skipped: b4df0fa557

Change-Id: I1254ee32a6dc91a2074b5ffdc1617d9594137c45