Merge "Associate user id with unlock token handle" into pi-dev am: 5748e3e917
am: 8d6360bbbd

Change-Id: I55de3dcd56bca174619a22920537e2c9365a1c38