am 3736704e: Merge commit \'e2f2e9fe594dd0cee702833a397edf1694fc61bf\' into donut

Merge commit '3736704e9863b52bb89d5233301a7eb812b05dc4'

* commit '3736704e9863b52bb89d5233301a7eb812b05dc4':
  AI 149496: Backport emulator-related donut fixes into cupcake.