Merge "[NAN] Fix incorrect log message"
am: fe0f393116

Change-Id: Ibfc65886bca7dbddf456cfe494b8ee5d3ea74295