Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97 am: a29bcecad9 am: 0517a6dcc7
am: 4c83ebbc4d

Change-Id: I28b2e7b87908f7f3175ed4f786bf56d25983b11c