Merge "Fix for package name test break in ART"
am: 66e7ba24b7

Change-Id: I2e68378a2be69da62a717026515b6fbc5cfab615