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

Change-Id: Ia02500da76876aae8649f40812a5d3451ad49459