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

Change-Id: I022e8f94d9264153f5016b175ee82c65a39a7a6c