[automerger skipped] [DO NOT MERGE] Comment out LPP in HAL am: 6c0b9e6df7 -s ours am: a8b160fb02 am: 2c17c37e61 am: 5db4aa1270 am: 347bc3e8f7 -s ours
am skip reason: subject contains skip directive

Change-Id: I35959b9fc1567d3aabd57abdb1fcbfc7db7e3533