Merge "Add strongbox KM instance as optional" into pi-dev
am: 3bf9a53ff3

Change-Id: Ia1a169781cb3525f60f9c58da378e91ea7d307f5