Merge "Adjust Class<T> parameter bounds in new Bundle APIs"