(bug 70806): Fix id length for sk so it wont get truncated

Change-Id: I0bc568c73f841ef107f1b8f46df7a6edd892981f
Merge "(bug 70806): Fix id length for sk so it wont get truncated"