Fixes: 132095489 Test: mp settingsg Change-Id: Icda6eb54496356e2567e1d39ab0c718746e2442d
Test: make Fixes: 123899489 Change-Id: I8e28d304b17cf5441bd9626924fa1450084062e8
String updates, images, reordering Test: manual Bug: 123899489 Change-Id: Ib7658e427c4868d954dd4cce3779588baaf5a02e