Fixes: 221894523 Test: Added unit tests Test: Manual test Change-Id: I2285e4e24d94d519ee68dde74edc2d4fb2120146