Updated to get N7000 and P6800 to build properly

Change-Id: Iae3c4f4d25ae21288ce6ddfe2cb2f360396ab3c0