Merge "Fix potential NPE in STHelper" into udc-dev