Merge "[NAN] Fix TlvElement member names - reflect public access. am: e40b4d344e"