resolved conflicts for merge of eb10ccbc to lmp-dev

Change-Id: I1d3220bcfe53ab6ad9dba87ef8e41b52f3bb1f30