am 7ca4682e: Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev

* commit '7ca4682e2d4b256b62edca558a6f3a2494d0dcd4':
  GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""