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

Change-Id: I219c1c4a0d9c07a1a0f2b726fdda83dd7879473a