Merge "Checkpoint of better dynamic device support."