Merge "Migrating functions for on device linking." into honeycomb