Added fallback for cmdline if not provided in config. (cherry picked from commit 1e098a4b34c68e9b1878efb9d7c1b56a2c220619)