Merge "Make the rs namespace visible" into oc-mr1-dev am: f34814e06c
am: b62e979d72

Change-Id: I782b5bf2031d916b467fd5f9e9fdba74ecc8bc54