N5X Changes

Change-Id: I030101ff494e57711a30daf72003ee7f89c5cea9