[fixed] stability issue

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