Merge "Add methods used by Settings robo tests"