Also: - correct use of strlcpy() - add some more logging Bug: 21833352 Bug: 22181260 Change-Id: Id153e17b8d4d32a35d38846599aa51147739e163