Test: make Settings Bug: 76692459 Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Bug: 22817899 Change-Id: Ic3055aa6a5baae1653db350313366f180c049cc7