[fixed] stability issue

Change-Id: I0b26ab4ce6c70e4616a667e86fb7fb8a33fdba28
Merge "[fixed] stability issue" into unstable