Fingerprints

Change-Id: I185c68a203cf37de893d1f8bdaf95eea0f421871
Update some props

Change-Id: I4fe6ac659f1f313127de945ead5519e92a63d833