Merge "Fixing an Active Unlock security vulnerability." into tm-qpr-dev