Required by ISO/IEC 14496-14:2018 and ISO/IEC 23000-19:2018. Issue #755.
Fix the problems in the previous CL for #651.