[automerger skipped] Merge "Fix bug in passing argument to switch dsds" am:...
[automerger skipped] Merge "Fix bug in passing argument to switch dsds" am: a9f04bf9 am: 28ce8356
am: 7a92e12c -s ours
am skip reason: change_id I589d879cd187f1a481cabc3a018f5b8a08f21840 with SHA1 ddea9005 is in history
Change-Id: I0ad34630ba4a1a60ac4554740032cd222dddc0df