(unstable) [fixed] stability

Change-Id: I619d12b3aba7bf3574f7d59caaddf5d002598dfb