A patch from a fellow googler.
metadata could be nil
Merge branch 'rtp-patch' into next_version