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

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