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

Change-Id: Icea741b90b9d45e8cde424d841e73ee3613135d8