Multiple changes, e.g. fix merge job breaking on unprintable char

Change-Id: I87f955f8ba36ad784cdd673c3315fd599221889c