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

Change-Id: Ic3c4798dbf4667dddad0a35cd8f24c078d7e245a