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

Change-Id: I926cc3f841d426f3918fb963c22e5c7ec7cebb58