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

Change-Id: I42b4d0c1b40b9ae6df076d5845331a50b93f2dd6