Merge "Fix UidMap proto output error. And fix a bug in MaxDurationTracker." into pi-dev