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

* commit '1461b8e9a0573442d8259c5035025e847cb511d7':
  Fixing a crash introduced by my previous CL.