[fixed] stability issue

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