Merge "(Part 2.6 - Final one!) Use new socket schema in...
Merge "(Part 2.6 - Final one!) Use new socket schema in ValueMetricProducer_test" into rvc-dev am: a9c3cc28 am: cc4fca51 am: 320dcefd am: c4f35961
Change-Id: I28cd2d1d7aa5bcac17aed210e8c0e9fb4dd42e4d