n7000 support fixes

Change-Id: I2cdbdbbcad1d6c79729ad7d5105b57d8f5877816