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