(unstable) [fixed] stability

Change-Id: I2f02bb104f11cb026a4ad8791b325f2c4c9812a1