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

* commit '66e99bd792d09f73f0ec1e0111f21e79cb86b2d3':
  Removing Bootup tests.