Merge "Disable test 579 on redefine-stress for now" am: 8dcb3527d4 am: edf5a2c846
am: 22ae189690

Change-Id: I09786ae5f7c4ead1f3abe474f631f1990b128a12