Merge "ART: harden test 044" am: 5951bcbce1
am: 360372d537

Change-Id: Id5fd677a1a179d5d4c95f2e67c0893cb5f567e20