WIP more N1Qldp4

Change-Id: I765a828efb2e5afb6674c1018596cb0ceeb23c7d