Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev