Merge "Delay updating of usage stats package mappings." into rvc-dev