Merge "Remove 17 bytes length restriction for vaultHandler." into pi-dev am: d9e1a8fd68
am: a7767c9fcc

Change-Id: I7a9c00234159f3873744f2a33dd2d50ec6720ce6