- Also do some minor refactoring Test: robotest Fixes: 131921277 Change-Id: I8de2e1b9b384ef9722bbe95111b86193fddb83d5