Apply polish fixes from review PR #1842

Job	Run time
android-arm / initialize	35s
android-arm64 / initialize	32s
android-x86 / initialize	39s
android-arm64 / docker-build-image	31s
android-arm64 / docker-unittest-image	0s
android-arm / docker-build-image	33s
android-arm / docker-unittest-image	0s
android-x86 / docker-unittest-image	0s
android-x86 / docker-build-image	36s
android-arm64 / arm64_devel	32m 5s
android-arm64 / arm64_debug	18m 44s
android-arm64 / arm64_qa	7m 10s
android-arm64 / arm64_gold	7m 24s
android-arm / arm_devel	19m 20s
android-arm / arm_debug	15m 48s
android-arm / arm_qa	8m 17s
android-arm / arm_gold	6m 38s
android-x86 / x86_devel	19m 35s
android-x86 / x86_debug	20m 57s
android-x86 / x86_qa	8m 1s
android-x86 / x86_gold	6m 41s
android-arm / ${{ matrix.name }}_on_device_${{ matrix.shard }}	0s
android-arm / ${{ matrix.name }}_${{ matrix.shard }}_test	0s
android-arm / on-host-unit-test-report	0s
android-x86 / ${{ matrix.name }}_on_device_${{ matrix.shard }}	0s
android-x86 / ${{ matrix.name }}_${{ matrix.shard }}_test	0s
android-x86 / on-host-unit-test-report	0s
android-arm64 / ${{ matrix.name }}_on_device_${{ matrix.shard }}	0s
android-arm64 / ${{ matrix.name }}_${{ matrix.shard }}_test	0s
android-arm64 / on-host-unit-test-report	0s
	2h 54m 6s

Provide feedback