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

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