fix bug

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