Merge "Fix for package name test break in ART"