Merge "Shift to measure per-userId OBB directories."