Merge "Add classes/methods used by Settings robo tests"