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

* commit 'e361ca6428e137410ab828f5dee6148b8bdc29b3':
  Migrating functions for on device linking.