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

* commit '09e174875c23eb7ca9cd78655103d11d6d110fe4':
  Fixing a crash introduced by my previous CL.