cleanups, use symbols exposed by system, mark strings as untranslatable

Change-Id: I4e04c8dc3cde772ff2e81d6d096920003fb53e2c