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

Change-Id: I2bb9a0eb5040d0dd37ec2ffda5fa06bde9ee6a50