Merge "[DO NOT MERGE] Allow fingerprint to access persist property" into udc-d1-dev