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

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