Merge "Insert a new `versionInfo` field into the `.rs.info` symbol" into oc-dev am: 3cfa6a0673
am: 85bf505a0d

Change-Id: I9810dbd0aea88af68adee8f13585d814bff7d124