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