Minor cleanup to match code lab improvements.

Bug: 32214858
Change-Id: I898e3ea65669c863e6f915993c511e9d623ab25d
3 files changed