[fixed] stability issue

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