am 2e42038d: am e361ca64: Merge "Migrating functions for on device linking." into honeycomb

* commit '2e42038d4efe9b859fc536c7e5283b9a0e2e17dd':
  Migrating functions for on device linking.