Merge "Merge "Force creation of Socket upon Transform application" am: 119cf2bc61 am: abcf07af81" into pi-dev-plus-aosp
am: ffec0b0f43

Change-Id: I9ba6fb1058ca0f67c531d173574c8f9a8d978060