Merge "Make BootImageProfileTest less flaky" into rvc-dev