fix deployment bug

Change-Id: I4045cb59e47542ef5dd18eba92f3afaaa15119ff
Merge "fix deployment bug" into dev/experimental