[fixed] stability issue

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