Merge "Force creation of Socket upon Transform application"
am: 119cf2bc61

Change-Id: Ia19da86a3fa40e309ff7a079307a8a63de8ba796