Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am: 42cbbc3052

Change-Id: Ia46cdcee9c65d7394896e34e216f19dc1e7a5d31