Merge "[NAN] Remove builder API using String to translate to byte[]"
am: 1bca5ad210

Change-Id: Ia08fe939499fa8f9a09958ce28cef9676d442600