Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e
am: 66741c2c0f

Change-Id: I5cef0e013ff9ca49216cc1e6c8208353f2d063f4