Merge cherrypicks of [11430646] into studio-4.1-release

Change-Id: I11896bc1800b5c2b786310943785855b8c7677e4
tree: e8ec05267cd9dfe4abc3f2e27a20f8c182d875dd
  1. firebase-testing/
  2. test-recorder/