Prepare target testing device setup for the move to the Runtime APEX.
am: 0f9823e03a

Change-Id: Ic162630066ed8a6a2cb4b9b72a4cc42db6289683