Merge "Fixes starting app in docked stack for cts tests" into oc-dev
am: 6ccaf9061a

Change-Id: I9e5f6139731b043eb48e2fe6b68b23a754d14d68