Merge "Insert a new `versionInfo` field into the `.rs.info` symbol"
am: c29bfc44f2

Change-Id: I7d2da9a4fec23d50072124c4f913f5e3c80f5e45