Merge "Add Remote Control Pass Through Tests" am: 60595202f0
am: ffdab000f8

Change-Id: Ia1a12bbd1ef964427ea85f6fd053aadc8059ff0f