Merge "Update unit tests to use new socket schema" into rvc-dev am: 0810d57f...
Merge "Update unit tests to use new socket schema" into rvc-dev am: 0810d57f am: 67faaa92 am: e1d3ee74 am: d28cdb2d am: c4333331
Change-Id: I04f4cd02be28e7d90bcce4556380239630af40f2