Merge "Change mini-keyctl command format." am: 34e1b402a6
am: 3c6e86bc11

Change-Id: I3b668a33eb00811f092b54be1210ff5dbd54413c