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: 0f747c97
am: 100f9e3f
Change-Id: I030d6e2ea9ffbf5530689ba75c7cd02d9c9eaa3d