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

Change-Id: Ia496286fbc4aca2649407fe13ecfe8020051a397