Optional use of NG components.

Change-Id: Iaf9dd70f16b6bac8f1eb0f9204be774c0f5ef4ca