Merge "Add safer Bundle APIs and deprecated old ones"