Merge "Add flag to cmd for dynamic services" am: 6540819ca8

Change-Id: I04be6ecf0ff9aee11ab488ab4ac8933420306209