Merge "fix fingerprint condition on sdk level logic" into pi-dev