Merge mpr-2021-11-05

Change-Id: Ibfcc499fa50e2739544ba2c23dfdbe324acb7e84