Merge "LockPatternUtils clean up continued"