Fixes: 315267179 Flag: EXEMPT bugfix Test: atest SettingsRoboTests Change-Id: I9858374fe101ee5908e16104ed7b4ca6af0308cd
b6fc7a6f58
fdd68f473b