NOFN V1.35

Change-Id: Id0fd39032c45a2741948855e5bdf99425a29ad5d