Merge "[TNU07] Remove unused resources" am: fcdacd8e am: c4045768 am: 138b5f9d am: 9e4f61fb am: ef147687 Change-Id: I46081638e8198287e2db363c29c0fbb9eb83f9de