[fixed] stability issue

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