Merge changes from topic "am-40e688780ec34a97b9691997681d16fc" into android12L-tests-dev

* changes:
  [automerger skipped] Merge "Fix event parsing" into android12-tests-dev am: 70d02f260c -s ours
  [automerger skipped] Fix event parsing am: 8ee895862e -s ours