Merge "Respect limited requirements for Strongbox KM implementations" into pi-dev