NVP sample config option should match code.

Fixes bug #1205169
Change-Id: I894ce7b2a733127fe2185833f6407c0391eb9e2a
Merge "NVP sample config option should match code."