Merge "Blacklist test under gcstress." am: 3678820dd7
am: 119bdf9981

Change-Id: Iecbd2a97b982b94a41f47b7d9e2918e7903a92ef