Address review feedback

4 jobs for !1710 with android-12 in 10 minutes and 13 seconds (queued for 2 seconds)
merge request