Merge "Clear binder id before checking if LOHS can be created" into udc-mainline-prod