Merge "Disable BootImageProfileTest presubmit" am: 31d2ae697f am: 5691f1b79c

Change-Id: I1d8f4f4372aafefa009b21e515756a6adbb030c6