Required by ISO/IEC 14496-14:2018 and ISO/IEC 23000-19:2018. Issue #755.
Change-Id: I38c0ca9ed206536a4fd84e8c9c074609250013cc