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

Change-Id: Ib5a39751dc9ce9665d2f7d8ff8baeef08c32b998