Removed dependency on private Bundle methods.

Progress towards unbundling.

Change-Id: I4ee2380d2e9cf5e8ad75a6b0eca15a9dd566bd27
1 file changed