Merge "Revert the explicit config, see topic" am: 1914fc65f8
am: ee57fadf2d

Change-Id: Ice681eb61ca83914bb305cb8d8776cbfa826e906