Resolve two ResourceNamespace.TODOs and reduce use of deprecated methods

Test: existing
Bug: N/A
Change-Id: I4cd4afcf860b975d1b9a6cb0484981a6d951fb3d
(cherry picked from commit 9d560f81a24ea2bc99e2b385b651c8702b30a655)
12 files changed