Make the rs namespace visible am: 7075bca364 am: e6840fdba7  -s ours
am: 73e8943fa7  -s ours

Change-Id: Idea81eb9e63733860c51d317abbe42044105cfbe