Merge "Stop double-printing config"
am: a7d4e0cd73

Change-Id: Icefca1547a8361d3678b8be7d30776325de47b73