(unstable) [fixed] stability

Change-Id: I71cbbf4e7417f6e527b5eb8a4050c6ebdf6c38ff