Merge "MediaMetrics: Remove remaining BOOTTIME references" into rvc-dev