[fixed] stability issue

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