am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev

* commit 'bd87b6b5b0c478c45d0dd5725cbc59995e751c64':
  Make additional shared elements a version-checked feature.