Add the changes that work when added to individual r-scripts

Change-Id: I8e6c25187cb44a3a04acb518a97e0e48b0af1bfa