Merge "Fixing NPE in TransfromParams.java" into udc-dev