N5X Changes

Change-Id: I7c502db8aa7dca3577331ac0f2f7c331a6028058