Bug: 292036686 Test: manual - with Settings Test: unit tests Change-Id: I8a9faaefe4780667a2747a4ef1573361d3258705