Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev