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

Change-Id: I8162ec3b81ceb0d3ec63bbd63bffea1b93afd3f1