Merge "Fix: Propagate cmd args to multi-package sessions."
am: 2dc8b4cec8

Change-Id: Ib422b1dd4fa91971594af23d781ce2129cda6c39