[fixed] stability issue

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