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

Change-Id: I1019b5c514424043144351aa893b4f5048e4207e