Merge mpr-2021-11-05

Change-Id: I9224ee78d8a585efd69773eec8d300b985fe8a73
tree: f392f0a748a5046572b657ff858067b18a256f2f
  1. .prebuilt_info/
  2. 1/
  3. current/