Fix N checking am: d0ce6136fe
am: fd9ebb1149

Change-Id: I9d725d30c26016a585a0bbbc66f5bc6dfeb3022e