Merge "refactor(lib/measurement): move measurement descriptors" into integration