Revive NOCC. Yay!

Change-Id: I7127f088c91563139e9144bb189266eb16c5e19e