Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev