NOF-Nemesis V1.60

Change-Id: Ifd34be847499496887af4ae2579178c9e4428e06