Merge "Disable 127-merge-stress"
am: b1994dabc5

Change-Id: I4f7cc0f22d44c5f1457220d52b95824c4cc81e86