Merge "OWNERS: Add nnk and remove dcashman" into pi-dev