Merge "Remove KM strongbox instance temporarily" into pi-dev
am: d331fc27af

Change-Id: I0e85953a48da5a59e7164d8768833128012401ad