Merge "Trust: Look at the security unlock method of the right user" into lmp-dev