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

Change-Id: Icd7eb313d567b972af822dddf19f2103ed202d62