Merge "Revert "Disable BootImageProfileTest""