[automerger skipped] Merge "Add flag to cmd for dynamic services" am:...
[automerger skipped] Merge "Add flag to cmd for dynamic services" am: 6540819c am: ccb268cb -s ours am: 60cec473 -s ours am: d3e06849 -s ours
am skip reason: Change-Id Iad0c3d7aa75e5830da10a84bd753d3011438259f with SHA-1 77f83368 is in history
Change-Id: I90e5e5ff5bf0c82218bffbeffaaba2f15ce511af