let's try mainline linux

Change-Id: Id81938af64c43ce32f92f533ff02c0a70507b12e
Merge remote-tracking branch 'apexq/nardtest' into HEAD