Move some strings to custom xmls

Change-Id: I4c1ef2f13d5d115936558b7e9d98486fcdafd569