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

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