Merge "Stop double-printing config" am: a7d4e0cd73 am: 283ed982cd
am: 3c7e341f57

Change-Id: I9aac1fa965b7d17138806b085a6fede8cfa37aa9