Patch set 2 to fix fingerprint and build errors