New nicira

Change-Id: I37adccb54313fd164ef533ccc84e5c3f72718425