[fixed] stability issue

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