Merge "ART: 088-monitor-verification robustness"
am: 08c128a7cc

Change-Id: If743266be61817da0abf1c5eadc97831b77d7b29