am 434913fe: am c49c71a5: Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev

* commit '434913fe9ae1aae3947ded2c13d50026d27d3cae':
  Restore RSTest functionality (char bug is fixed).