[fixed] stability issue

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