[fixed] stability issue

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