(unstable) [fixed] stability fix

Change-Id: I612ee78fe44ee1284c7a66ddb3a92c398dbf1063