am 4715ebef: am 66e99bd7: Merge "Removing Bootup tests." into klp-dev

* commit '4715ebef92688c849842c99d1bd09e3f7e225938':
  Removing Bootup tests.