[fixed] stability issue

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