Merge "DO NOT MERGE - fix compile error from cherry pick due to member method becoming static." into lmp-mr1-ub-dev