resolved conflicts for merge of 45037622 to lmp-mr1-dev

Conflict was caused by the fact that Icad265ed is in lmp-sprout-dev.
It was only supposed to be in lmp-dev.  Since it is sprout-dev, those
lines disappeared from Ibcb2e11d and are therefore missing in
lmp-mr1-dev.  This merge puts those lines back in.

Change-Id: I9361eafdf4a1b39019001c5ac6c63eca45e4d2b9