[fixed] stability issue

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