Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97
am: a29bcecad9

Change-Id: I622b78805d08a4e9c59e207598ebc5f3cbf8d135