Merge "Fix HDM NPE when storing static chip info" into udc-dev