Merge "Clean up trivial package refactor TODOs"