Merge "Change to device-tests" into rvc-dev
tree: 6369ba5f81a81d2197526e443e958b571713cdc6
  1. apex/