Merge "Add strongbox KM instance as optional" into pi-dev