am 1503623c: am ac70c647: Merge "Fix to a compatibility patch that was missed...
am 1503623c: am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
* commit '1503623c':
Fix to a compatibility patch that was missed in ag/587241