Merge "Fix to parse TAG_SUBSEC_TIME correctly." into mainline-prod