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

Change-Id: Ib8cfa7e40cc3fc3c5fdbaef7901a0d0c3da38bc5