[fixed] stability issue

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