Merge "Revert^2 "Add MAU metric."" into udc-mainline-prod