NJ costing changes.

Change-Id: I1bab98a9cbb6745ad64fa8e8fd0e0011f6ef55c6
Merge "NJ costing changes."