Merge "Delete ByteStringUtils: it is no longer used" am: a677e4d5a0 am: ee2ded047a
am: d894c2498a

Change-Id: I7e9480bb310c3d9b7db2e9f9c921704d49d47112