Some resource files also use a + prefix; allow that as well as -. Change-Id: I79cf13841849633f8fa49ee7e23698079d890489