resolve merge conflicts of a47780b9 to lmp-dev am: 61f27551 am: b5f75c45 am: af43cd03 -s ours am: c681771b am: de03f5ac am: 7d106d59 am: b8f35dd7 Change-Id: I9761ac7ba5f26a1e581fa1446e6e4b36753cf424
