Merge "Fix resource contention in Fake STHAL" into udc-dev