Merge "Fix bug in on-device linking." into honeycomb