Merge "Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev am: 9259969b am: 8e5fbe32 am: ac1f38fb" into sc-v2-dev-plus-aosp