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

Change-Id: Ia101c66696738ca6fe49d2c7c6b826683c4fa089