am 6ee2cfa6: Merge "Run test only on KitKat devices"

* commit '6ee2cfa66c81162c2a42572ea63af1b5e38e339f':
  Run test only on KitKat devices