Merge "Removed dependency on private Bundle methods."