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

Change-Id: I194fb3044998a8f02ff80caefae283a765594417