Merge "Stop writing NUL bytes in adbkey.pub." am: d340c1ebbe
am: 68c9642a9d

Change-Id: Ib0ebb4bd8a88437e221d448c545d7698634cd2ff