Add nulls during reading of settings and info files

Change-Id: Ie6202a8cc709d8593768f447ef95b4a815605d6b
2 files changed