Merge "Remove KM strongbox instance temporarily" into pi-dev