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

Change-Id: I81f60f41ee85fda5e903d0f188cfd51da1f2e7d0