[automerger skipped] Merge "Force creation of Socket upon Transform application" into pi-dev am: d74a971fc2  -s ours
am: 0fb0504bdc  -s ours

Change-Id: I40c72c6ba6705ad12a6a414aedacd5ce2a930622