Fix N checking am: d0ce6136fe
am: 3f20da8de4

Change-Id: I9c4c6511b4da12e31d1a6fe74ab665edd22ae41f