Handle default package properly in deployment config (#12461).

Change-Id: Ied046a49c4e3046011658dd77963972ea1e9e806