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

Change-Id: I05e21dca880f481c4795ff7609a1e0185a23fb9f