Fix: 259520506 Test: Unit test Test: Manually with Settings Change-Id: I3cbd1171df7e6bfcac6b9ebf4901e36fc2d7b14f