Merge \\\"Remove work fingerprints when primary profile lock is removed\\\"...
Merge \\\"Remove work fingerprints when primary profile lock is removed\\\" into nyc-dev am: 42cbbc30 am: 5ec65517
am: ea250358
Change-Id: Idbf1017bb90fb8d875cb3b721013954d87dd43d2