Merge "libmetrics: Update BASE_VERS to 369476"