N5X Changes

Change-Id: Ib09651e3e646bd265f3047cfa413065a6646d2a2