which should hopefully
a) work
b) unblock the upgrade path for icu

Change-Id: Ic70a627f3135e53016a4f9cfdef3fc85d55ab3e4