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