NOF-Nemesis

Change-Id: I4cf366e5f557733c9caa02d3fe784055394a0164