Merge "Fix double initialization call."