[automerger skipped] Merge changes from topic "rs_to_rscript"
am: 4cebb2ca3d -s ours
am skip reason: change_id I10a23ceee696df7fe363cc5d825e45100565cbdf with SHA1 6235cd99df is in history

Change-Id: I1d89443cb61cfffe4078dd71a5e33aa22a70d1be