No unopkg in the sandboxed case, I think

Change-Id: I39d17cc9bf05ca33c0d0f36bdb71417ae5cc4caf
Fixup build breakage

Change-Id: I287a55a2d174e4714486d5e893499151db2380cc