Test: make Settings Bug: 76692459 Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Bug: 32953042 Test: robotests Change-Id: Iecdb0a42695644ff8aa095bcd49b5ccb16aa46d4