am c4294ed2: am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev

* commit 'c4294ed2f1de5c89b5e283942e0d5f8cd8822bfb':
  Unhide new RS APIs.