Fix review comments for earlier CL

Change-Id: Ia4a637f5d46f8ef0d7d5cefb953565c091c79df3
2 files changed