[fixed] stability issue

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