am 2e21a7d5: am 2f388d7a: Merge "Correcting 2 FC\'s in Dev Tools"

# By HardCorePawn
# Via Android Git Automerger (1) and others
* commit '2e21a7d5fcb3201c5da1e281063751810fcb01f4':
  Correcting 2 FC's in Dev Tools