Merge "Fix IDENTIFIER_TYPE_HD_STATION_ID_EXT javadoc typo" into udc-qpr-dev