Address some leftover comments

Change-Id: Ia8d01c8b1c10d23efdd94aa76289a1ed3373957c
4 files changed