Merge "Fix alarm processing of QUERY_PACKAGE_RESTART" into udc-dev