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

Change-Id: I8e95520d2cc0517c97a6bca87bb537dbf6755849