[automerger skipped] Merge "Use new socket schema within TestSlicedCondition"...
[automerger skipped] Merge "Use new socket schema within TestSlicedCondition" into rvc-dev am: 9f9ca14b am: 80013174 -s ours
am skip reason: Change-Id Id3c9522c4467c4869ec97226734a556dd9dfb169 with SHA-1 dfd63d45 is in history
Change-Id: I742813ff9b4fac97747352f63d4aa665113454d2