Havana changes for n1k horizon for review

Change-Id: I003c691cd3b88f1d15f088e1e2b425501a01bc38