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

Change-Id: I974612e889f581d7361dadc69f176c6912661cca