base

resolved conflicts for merge of 08c72334 to lmp-mr1-dev

Used "-s ours" for the merge since this CL had been cherry-picked from
lmp-mr1-dev to lmp-dev so when auto-merging back, we want to keep what
is already in lmp-mr1-dev.