[automerger skipped] Merge "Add flag to cmd for dynamic services" am: 6540819ca8 am: ccb268cb80 -s ours am: 60cec473f8 -s ours

am skip reason: Change-Id Iad0c3d7aa75e5830da10a84bd753d3011438259f with SHA-1 77f83368b1 is in history

Change-Id: Ia3fd678849a0b23ced20a7156c43c81fd2ede47b