Merge "Merge "IFingerprint: update comments" into sc-dev am: b09f62d6a6 am: d66c3dd174" into sc-v2-dev-plus-aosp