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

Change-Id: Iaff18dac0847676ab712261ee5f71588d55fc7e4
tree: d2223a41f7ab131a4a14e8f41f5dfeb06dc781c5
  1. firebase-testing/
  2. test-recorder/