Merge EXPECTED_UPSTREAM change in boxed types

The master has the 11+28 versions already. We update
the bookkeeping record here.

Test: n/a
Change-Id: I7264445601400b278d5ffff115bae8bdd895f8f5