make these resources non-local, simplifies for ui conversion

Change-Id: I2654cf0522f2f04cd4a14d0e04f18f26e175e354