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

Change-Id: Iaf0d751028067ad622f2cc91b019c634245f357f