Merge changes Iba48c173,If0a71607 into rvc-dev

* changes:
  Use shell commands instead of ITestDevice for BootImageProfile test
  Make BootImageProfileTest less flaky