resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c  -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b am: 3a53e2ce04 am: 2bbafc1f7d am: c3f3fdfc7d
am: e2032632f4

Change-Id: Id24ea4fd770b84ddda182e10107bedac6e214f1d