Merge "Stop writing NUL bytes in adbkey.pub." into oc-dev
am: 39225a131b

Change-Id: I605a444d9f1b421800f152e281ba93675fcefc2b