More S/R related edits

Change-Id: I58cb6d82c672b3edae90d912909f0bc33a501bf2