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

Change-Id: I95f3e2581de041cef91f1e3f802b574a020df5c3