Merge "Merge "Force creation of Socket upon Transform application" am: 119cf2bc am: abcf07af" into pi-dev-plus-aosp