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

Change-Id: Ia279a2741af33969a1006893127618054ad5dcc6