[automerger skipped] Merge mpr-2021-09-05 skipped: 056c334cdb

Change-Id: I693819cfffbee42beff328babcc72aa4e4f0ae52